Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 27 Apr 2010 12:24:59 +0000 (12:24 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 27 Apr 2010 12:24:59 +0000 (12:24 +0000)

Trivial merge